From cd4eaa0c8b334b0aa035f07d2a278aad6911f411 Mon Sep 17 00:00:00 2001 From: Michael Schumacher Date: Mon, 22 Jan 2007 00:33:20 +0000 Subject: [PATCH] declare the test programs used during doc creating as variables to keep 2007-01-22 Michael Schumacher * docs/Makefile.am: declare the test programs used during doc creating as variables to keep the commands in targets readable. svn path=/trunk/; revision=199 --- ChangeLog | 5 ++ docs/Makefile.am | 195 ++++++++++++++++++++++++----------------------- 2 files changed, 104 insertions(+), 96 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1295af8..71a4434 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-01-22 Michael Schumacher + + * docs/Makefile.am: declare the test programs used during doc + creating as variables to keep the commands in targets readable. + 2007-01-22 Øyvind Kolås Applied patch from Tim Mooney fixing bug #392916 diff --git a/docs/Makefile.am b/docs/Makefile.am index 7e3d230..011b985 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,96 +1,99 @@ -.SILENT: -SUBDIRS= graphics -DIST_SUBDIRS= graphics - -# The patterns used for html creation in the babl build system -# is very small, and should probably be documented in a tutorial. -# -# -# -HTML_FILES = index-static.html \ - index.html \ - BablFishPath.html - -EXTRA_DIST= \ - .cvsignore \ - babl.css \ - tools/xml_insert.sh \ - tools/changelog2rss \ - index-static.html.in \ - index.html \ - LGPL - -BUILT_EXTRA_DIST = index.html BablFishPath.html BablFishPath.txt - -CLEANFILES = README changelog.rss -DISTCLEANFILES = index-static.html -MAINTAINERCLEANFILES = $(BUILT_EXTRA_DIST) - -all: $(HTML_FILES) rss - - -BablFishPath.html: $(top_builddir)/tests/babl_fish_path_dhtml$(EXEEXT) - echo -n "HTML:" - echo -n " $@" - export BABL_PATH="$(top_builddir)/extensions"; $< > $@ &&\ - echo " [OK]" || echo " Fail" - -BablFishPath.txt: $(top_builddir)/tests/babl_fish_path_fitness$(EXEEXT) - echo -n "UTF8:" - echo -n " $@" - export BABL_PATH="$(top_builddir)/extensions"; $< > $@ &&\ - echo " [OK]" || echo " Fail" - if [ "x"$$CRUCIBLE_ID != "x" ] ;then echo;echo;cat $@;echo;echo;fi - -index.html: index-static.html \ - $(top_builddir)/tests/babl_html_dump$(EXEEXT) \ - $(top_srcdir)/AUTHORS \ - $(top_srcdir)/NEWS \ - BablFishPath.txt \ - Makefile.am - echo -n "HTML: $@" - cp $< $@ - (which tempfile > /dev/null&& TMPFILE=`tempfile` || TMPFILE="/tmp/babl_build_tempfile" ;\ - export BABL_PATH="$(top_builddir)/extensions"; $(top_builddir)/tests/babl_html_dump$(EXEEXT) > $$TMPFILE;\ - $(top_srcdir)/docs/tools/xml_insert.sh $@ BablBase $$TMPFILE;\ - rm -f $$TMPFILE ) - echo -n "." - - $(top_srcdir)/docs/tools/xml_insert.sh $@ BablFishPath BablFishPath.txt - $(top_srcdir)/docs/tools/xml_insert.sh $@ AUTHORS $(top_srcdir)/AUTHORS - $(top_srcdir)/docs/tools/xml_insert.sh $@ NEWS $(top_srcdir)/NEWS - echo " [OK]" - -distclean-local: - if test $(srcdir) = .; then :; else \ - rm -f $(BUILT_EXTRA_DIST); \ - fi - -rss: changelog.rss - -rss: changelog.rss - -changelog.rss: ../ChangeLog - echo -n " RSS:" - echo -n " $@" - tools/changelog2rss $< > $@ && \ - echo " [OK]" || echo " Fail" - -web: all graphics - echo -n " WEB: " - ping -c 1 $(WEBSITE_HOST) >/dev/null && \ - (\ - scp *.txt *.html *.css\ - "$(WEBSITE_HOST):$(WEBSITE_LOCATION)/" >/dev/null && \ - echo -n "."; \ - scp graphics/*.png graphics/*.html\ - "$(WEBSITE_HOST):$(WEBSITE_LOCATION)/graphics/" >/dev/null\ - &&\ - echo "[OK]"\ - ||\ - echo "FAIL scp failed (does dirs exist?)."\ - )\ - || \ - (\ - echo "FAIL $(WEBSITE_HOST) not reachable."\ - ) +# programs used for doc creation +babl_fish_path_dhtml = $(top_builddir)/tests/babl_fish_path_dhtml +babl_fish_path_fitness = $(top_builddir)/tests/babl_fish_path_fitness +babl_html_dump = $(top_builddir)/tests/babl_html_dump + +.SILENT: +SUBDIRS= graphics +DIST_SUBDIRS= graphics + +# The patterns used for html creation in the babl build system +# is very small, and should probably be documented in a tutorial. +# +# +# +HTML_FILES = index-static.html \ + index.html \ + BablFishPath.html + +EXTRA_DIST= \ + .cvsignore \ + babl.css \ + tools/xml_insert.sh \ + tools/changelog2rss \ + index-static.html.in \ + index.html \ + LGPL + +BUILT_EXTRA_DIST = index.html BablFishPath.html BablFishPath.txt + +CLEANFILES = README changelog.rss +DISTCLEANFILES = index-static.html +MAINTAINERCLEANFILES = $(BUILT_EXTRA_DIST) + +all: $(HTML_FILES) rss + + +BablFishPath.html: $(babl_fish_path_dhtml) + echo -n "HTML:" + echo -n " $@" + export BABL_PATH="$(top_builddir)/extensions"; $< > $@ &&\ + echo " [OK]" || echo " Fail" + +BablFishPath.txt: $(babl_fish_path_fitness) + echo -n "UTF8:" + echo -n " $@" + export BABL_PATH="$(top_builddir)/extensions"; $< > $@ &&\ + echo " [OK]" || echo " Fail" + if [ "x"$$CRUCIBLE_ID != "x" ] ;then echo;echo;cat $@;echo;echo;fi + +index.html: index-static.html \ + $(babl_html_dump) \ + $(top_srcdir)/AUTHORS \ + $(top_srcdir)/NEWS \ + BablFishPath.txt \ + Makefile.am + echo -n "HTML: $@" + cp $< $@ + (which tempfile > /dev/null&& TMPFILE=`tempfile` || TMPFILE="/tmp/babl_build_tempfile" ;\ + export BABL_PATH="$(top_builddir)/extensions"; $(babl_html_dump) > $$TMPFILE;\ + $(top_srcdir)/docs/tools/xml_insert.sh $@ BablBase $$TMPFILE;\ + rm -f $$TMPFILE ) + echo -n "." + + $(top_srcdir)/docs/tools/xml_insert.sh $@ BablFishPath BablFishPath.txt + $(top_srcdir)/docs/tools/xml_insert.sh $@ AUTHORS $(top_srcdir)/AUTHORS + $(top_srcdir)/docs/tools/xml_insert.sh $@ NEWS $(top_srcdir)/NEWS + echo " [OK]" + +distclean-local: + if test $(srcdir) = .; then :; else \ + rm -f $(BUILT_EXTRA_DIST); \ + fi + +rss: changelog.rss + +changelog.rss: ../ChangeLog + echo -n " RSS:" + echo -n " $@" + tools/changelog2rss $< > $@ && \ + echo " [OK]" || echo " Fail" + +web: all graphics + echo -n " WEB: " + ping -c 1 $(WEBSITE_HOST) >/dev/null && \ + (\ + scp *.txt *.html *.css\ + "$(WEBSITE_HOST):$(WEBSITE_LOCATION)/" >/dev/null && \ + echo -n "."; \ + scp graphics/*.png graphics/*.html\ + "$(WEBSITE_HOST):$(WEBSITE_LOCATION)/graphics/" >/dev/null\ + &&\ + echo "[OK]"\ + ||\ + echo "FAIL scp failed (does dirs exist?)."\ + )\ + || \ + (\ + echo "FAIL $(WEBSITE_HOST) not reachable."\ + ) -- 2.30.2